Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Fri, 16 Dec 2016 23:32:43 +0000 (18:32 -0500)
committerTom Rini <[email protected]>
Fri, 16 Dec 2016 23:32:43 +0000 (18:32 -0500)

Trivial merge